From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 25 Jun 2011 08:12:23 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~34
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5bde965a73827083cff9bdc3ee1e3adfcc73fc00;p=emacs.git

Merge from trunk.
---

5bde965a73827083cff9bdc3ee1e3adfcc73fc00